Edit mode bug fixed