Fixed always enabled editing