fix logic for payment setup?