Bug fixed for osx.