Fixed autoloading fixes #3