Temporary workaround for windows