Done.  Committed back to branch ticket254.

BTW, the above issue is prevalent in the math plugin. I only fixed the above line.