diff --git a/calendar/set.php b/calendar/set.php
index 0122b583d98..2633369d354 100644
--- a/calendar/set.php
+++ b/calendar/set.php
@@ -46,7 +46,7 @@ require_sesskey();
 $var = required_param('var', PARAM_ALPHA);
 $return = clean_param(base64_decode(required_param('return', PARAM_RAW)), PARAM_URL);
 
-$url = new moodle_url('/calendar/set.php', array('return'=>base64_encode($return->out(false)),'var'=>$var, 'sesskey'=>sesskey()));
+$url = new moodle_url('/calendar/set.php', array('return'=>base64_encode($return),'var'=>$var, 'sesskey'=>sesskey()));
 $PAGE->set_url($url);
 $PAGE->set_context(get_context_instance(CONTEXT_SYSTEM));
 
@@ -65,4 +65,4 @@ switch($var) {
         break;
 }
 
-redirect($return);
\ No newline at end of file
+redirect($return);