Partial fix for issue #1 on Mac OS X.