Fix bug with payment controller