@YingboMa @shashi could this be fixed by using the MuladdMacro expression changing on the generated code?