[RFC] - Fix duplicate payment