done editing fix#1