fix autoloader-problems (TODO)