fixed problems with autoloading.