Autoloader fix hopefully