Hopefully fixed autoloading.