minor optimalization to autoloader