Bug fix in autoload