Re-added compatibility to Mac OS X