add and edit fix