fixed edit 2