Change for compatibility for Windows