OS X Workaround