SubContract generation tweak