Fixes #1026 (VC++ compiler only). Would someone check that this fix
doesn't increase flash usage on 9x stock? Thanks!