FixNotation rewrite