#15 - fix editing bug