stab at fixing autoloader