I agree. You can try to change the "pay when paid" clause, but most GC's will not do that, reason being they can use that to hold pmnt, even though most of the time they have received pmnt.