Fixed: MSVS compatibility