ENG-4290 Fixed COW loop and eecheck.