Fix issue with autoload