Issue #116: previous commit broke unittests on OSX