Fixed bug regarding Windows