Fixes #2856
Fixes #2856

Signed-off-by: Adam Tallon <5d56eeab71b7413fd2f3d361383129cbf3bc50b1@gmail.com>

margarett/SMF2.1,mkress/SMF2.1,StealthWombat/SMF2.1-more-forkery,mkress/SMF2.1,georaldc/SMF2.1,georaldc/SMF2.1,StealthWombat/SMF2.1-more-forkery,margarett/SMF2.1,MustafaCan/SMF2.1,mkress/SMF2.1,MustafaCan/SMF2.1