fixed edit issue