Temporary fix for Mac