diff --git a/apps/payment/views.py b/apps/payment/views.py
index 02a2b874..ec9bef56 100644
--- a/apps/payment/views.py
+++ b/apps/payment/views.py
@@ -211,7 +211,8 @@ class PaymentwallCallbackView(View):
         pingback = Pingback(payment_raw_data, self.get_request_ip())
 
         if pingback.validate():
-            product_type_name, payment_id = pingback.get_product().get_id().split('_')
+            spltted = pingback.get_product().get_id().split('_')
+            product_type_name, payment_id = '_'.join(spltted[:-1]), spltted[-1]
 
             if product_type_name == 'course':
                 product_payment_class = CoursePayment
diff --git a/requirements.txt b/requirements.txt
index 27daa65a..1e16fc89 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -22,7 +22,7 @@ requests==2.19.1
 sorl-thumbnail==12.4.1
 twilio==6.14.7
 # paymentwall-python==1.0.7
-git+https://github.com/ivlevdenis/paymentwall-python.git
+git+https://github.com/gzbender/paymentwall-python.git
 # python-instagram==1.3.2
 git+https://github.com/ivlevdenis/python-instagram.git
 django-user-agents==0.3.2