small patch + autoloader