fixing for autoload