Making sure not to break OS X