payments ordering fix