Latest MacOS X fix