Possible fix for MacOS X bug.