Mac Fix for Windows Fix