diff --git a/analytics/static/analytics/js/charts.js b/analytics/static/analytics/js/charts.js
index 0cc4ba0..998e78a 100644
--- a/analytics/static/analytics/js/charts.js
+++ b/analytics/static/analytics/js/charts.js
@@ -436,30 +436,21 @@ var charts = {
 
 		});
 	},
-	month_heatmap: function(data, target){
+	month_heatmap: function(data, target, div_target){
 
 	
-		if(target == '#right-chart-body' && $('#month-chart').length != 0){
-			$('#month-chart').fadeOut();
-			$('#month-chart').remove();
-		}
+		
 
-		if(target == "#bottom-right-chart-body" && $('#weekly-chart').length != 0){
-			$('#weekly-chart').fadeOut();
-			$('#weekly-chart').remove();
+		if($(div_target).lenght != 0 ){
+			$(div_target).fadeOut();
+			$(div_target).remove();
 		}
-
 		var svg = d3.select(target).append('svg')
 		.attr('width', 300)
 		.attr('height', 200);
 		
-		if (target == "#right-chart-body"){
-			svg.attr('id', 'month-chart');
-		}
-		
-		if (target == "#bottom-right-chart-body"){
-			svg.attr('id', 'weekly-chart');
-		}
+		svg.attr('id', div_target);
+	
 
 		//color range
 		var color = d3.scaleLinear().range(["#29c8b8", '#149e91']).domain([0, d3.max(data, function(d){ return d.count; })]);
diff --git a/dashboards/static/dashboards/js/behavior.js b/dashboards/static/dashboards/js/behavior.js
index 86c6e55..b3ad6b5 100644
--- a/dashboards/static/dashboards/js/behavior.js
+++ b/dashboards/static/dashboards/js/behavior.js
@@ -8,7 +8,7 @@ $(document).ready(function(){
 
 	$('#month_selector').change(function(){
 		$.get('/analytics/amount_active_users_per_day', {month: $(this).val() }).done(function(data){
-			charts.month_heatmap(data, '#right-chart-body');
+			charts.month_heatmap(data, '#right-chart-body', '#month-chart');
 			
 		});
 	});
@@ -18,7 +18,7 @@ $(document).ready(function(){
 		defaultDate: new Date(),
     }).on('dp.change', function(ev){
     	$.get('/analytics/get_days_of_the_week_log', {date: ev.date._i}).done(function(data){
-    		charts.month_heatmap(data, '#bottom-right-chart-body');
+    		charts.month_heatmap(data, '#bottom-right-chart-body', '#weekly-chart');
     	});
 
     });
--
libgit2 0.21.2