Fixing so that this works on Mac OSX.  It's a hack of a fix, but it's verified working