Fixed issue with MSVS