correct autoloads, try to fix #2