Resolve bugfix osx