fixed class/module loading for #126