Fix for autoloading, take 2