LB-1190: Assign widow issues

fixed.