Fix for #8 on Mac OS X