change: fix to work with autoloader