Fixed functionality on OSX