diff --git a/erpnext/__version__.py b/erpnext/__version__.py
index 192f4a7f7b..9e406d36e0 100644
--- a/erpnext/__version__.py
+++ b/erpnext/__version__.py
@@ -1,2 +1,2 @@
 from __future__ import unicode_literals
-__version__ = '6.8.1'
+__version__ = '6.8.2'
diff --git a/erpnext/hooks.py b/erpnext/hooks.py
index a3c0194ee2..fd19dd3c21 100644
--- a/erpnext/hooks.py
+++ b/erpnext/hooks.py
@@ -29,7 +29,7 @@ blogs.
 """
 app_icon = "icon-th"
 app_color = "#e74c3c"
-app_version = "6.8.1"
+app_version = "6.8.2"
 app_email = "info@erpnext.com"
 app_license = "GNU General Public License (v3)"
 source_link = "https://github.com/frappe/erpnext"
diff --git a/erpnext/setup/setup_wizard/setup_wizard.py b/erpnext/setup/setup_wizard/setup_wizard.py
index 90856cade9..2289e26715 100644
--- a/erpnext/setup/setup_wizard/setup_wizard.py
+++ b/erpnext/setup/setup_wizard/setup_wizard.py
@@ -255,7 +255,7 @@ def create_taxes(args):
 	for i in xrange(1,6):
 		if args.get("tax_" + str(i)):
 			# replace % in case someone also enters the % symbol
-			tax_rate = (args.get("tax_rate_" + str(i)) or "").replace("%", "")
+			tax_rate = cstr(args.get("tax_rate_" + str(i)) or "").replace("%", "")
 
 			try:
 				tax_group = frappe.db.get_value("Account", {"company": args.get("company_name"),
diff --git a/erpnext/setup/setup_wizard/test_setup_wizard.py b/erpnext/setup/setup_wizard/test_setup_wizard.py
index d5dd6588cc..59bf8bf7f9 100644
--- a/erpnext/setup/setup_wizard/test_setup_wizard.py
+++ b/erpnext/setup/setup_wizard/test_setup_wizard.py
@@ -4,7 +4,7 @@
 from __future__ import unicode_literals
 import frappe
 
-from frappe.desk.page.setup_wizard.test_setup_data import args
+from erpnext.setup.setup_wizard.test_setup_data import args
 from frappe.desk.page.setup_wizard.setup_wizard import setup_complete
 import frappe.utils.scheduler
 
diff --git a/setup.py b/setup.py
index 2fbd4d3d5d..5327ce769a 100644
--- a/setup.py
+++ b/setup.py
@@ -1,6 +1,6 @@
 from setuptools import setup, find_packages
 
-version = "6.8.1"
+version = "6.8.2"
 
 with open("requirements.txt", "r") as f:
 	install_requires = f.readlines()