Fix for windows 8