Fixed Winodws compatibility