Only want latest valid payment. Fixes #5665