diff --git a/frappe/desk/calendar.py b/frappe/desk/calendar.py
index 127194671a..ed227e1dc3 100644
--- a/frappe/desk/calendar.py
+++ b/frappe/desk/calendar.py
@@ -29,6 +29,7 @@ def get_event_conditions(doctype, filters=None):
 def get_events(doctype, start, end, field_map, filters=None, fields=None):
 
 	field_map = frappe._dict(json.loads(field_map))
+	fields = json.loads ( fields )
 
 	doc_meta = frappe.get_meta(doctype)
 	for d in doc_meta.fields:
@@ -44,8 +45,6 @@ def get_events(doctype, start, end, field_map, filters=None, fields=None):
 		fields = [field_map.start, field_map.end, field_map.title, 'name']
 
 	if field_map.color:
-		if isinstance(fields, str):
-			fields = json.loads ( fields )
 		fields.append(field_map.color)
 
 	start_date = "ifnull(%s, '0001-01-01 00:00:00')" % field_map.start