Improve dummy payment behavior