Fixing Istvan's single payment issue