Bug fixing to complete payment