Bugfix: removing autoload check