Sync with OSX version