Fix module path. Support ST2