CLC-1386 Master branch addendum

allow Eli fix to run more than once without exploding