Fix bug with autoloader