Fix for macosx