fix autoloads here too