Fix for MacOS