Added workaround for MacOSX...