Fixed Bug: edit requires 2 undo to undo.