hopefully fixed all bugs on mac