Fixed an issue with autoloading