Fixed adding and then editing
Merged