Fixed but in which the wrong value was returned from _undo_substitution.