* Fixes For StepExpr