fixed autoload issues