Bugfix for autoload