RT#23741 Multiple payment options [quick fallout fix]