diff --git a/csf_za/__init__.py b/csf_za/__init__.py
index 3ced358..b5fdc75 100644
--- a/csf_za/__init__.py
+++ b/csf_za/__init__.py
@@ -1 +1 @@
-__version__ = "0.2.1"
+__version__ = "0.2.2"
diff --git a/csf_za/tax_compliance/doctype/value_added_tax_return/value_added_tax_return.py b/csf_za/tax_compliance/doctype/value_added_tax_return/value_added_tax_return.py
index a7807fd..fd128c3 100644
--- a/csf_za/tax_compliance/doctype/value_added_tax_return/value_added_tax_return.py
+++ b/csf_za/tax_compliance/doctype/value_added_tax_return/value_added_tax_return.py
@@ -203,11 +203,11 @@ def get_gl_entries(self):
 			.left_join(si)
 			.on((gle.voucher_type == "Sales Invoice") & (si.name == gle.voucher_no))
 			.left_join(sitc)
-			.on(sitc.parent == si.name)
+			.on((sitc.parent == si.name) & (sitc.account_head == gle.account))
 			.left_join(pi)
 			.on((gle.voucher_type == "Purchase Invoice") & (pi.name == gle.voucher_no))
 			.left_join(pitc)
-			.on(pitc.parent == pi.name)
+			.on((pitc.parent == pi.name) & (pitc.account_head == gle.account))
 			.select(
 				gle.name,
 				gle.voucher_type,