Fixes #3037 Thanks to @Balferian and @aleos89 Co-authored-by: Aleos <aleos89@users.noreply.github.com>