Added some checks for windows