Fixing for Apple
more work