Added RightTrim command for code fix