Fix for MacOSX