Fixed issue editing bug