fix ModuleCallActionExecutor (substitution issues) + possible fixes at
other places for this as well