Proposed solution for Bug 3598300 on MacOSX
fix Bug 3598300 on MacOSX too
fix Bug 3598300 on MacOSX too