fixed and deleted