Fix "payment in the future" problem