Fixed #1736 Thanks to @GrumpyLittlePanda for reporting and @Playtester for pointing me into the right direction.