Fix for windows case