Added workaround for windows