fix ModuleSuffix support