further changed for Mac OS X