Fix vs2013 again
Merge pull request #2817 from fluffyfreak/fix2013

Fix vs2013 again