Fix for windows solution