Fixed for visual studio