fixed mac and windows