Workaround for Apple :(
Added MacOSX workaround