Fixed issue with autoloader