Fix for Windows Systems