Little fix on autoloader