fixed: more modules issues