Fix for autoloading problems on some machines