fixed OS X support