Added fix for autoloader