Extend hack to support OSX