Fix for Mac