Started work on windows
Additional check to eliminate a possible error