Fix bug for autoload