Fix for Mac OSX builds (see issue #35).