Fix of Double getting during Editing command