Fix for Mavericks from Clemens Arth.