OS/X Patch from Torsten Spindler