Tweak from OS X testing