Bug fix with Mac OS X