fix for OS X specific regressions