Trying to fix differences between MacOSX and linux