Fixed ModuleLoader problem, I think...