fixed autoloading issues