Fixing issue on MacOS X