Escape fix + changed dfp