Fixed switching on osx