fixed the wonky autoloading