still working around issues with MacOSX