diff --git a/ext/standard/url.c b/ext/standard/url.c
index 315e088065c..23eb24bc383 100644
--- a/ext/standard/url.c
+++ b/ext/standard/url.c
@@ -297,9 +297,12 @@ PHP_FUNCTION(urldecode)
 		var_reset(return_value);
 		return;
 	}
-	len = _php3_urldecode((*arg)->value.str.val, (*arg)->value.str.len);
 
-	RETVAL_STRINGL((*arg)->value.str.val, len, 1);
+	*return_value = **arg;
+	zval_copy_ctor(return_value);
+	
+	len = _php3_urldecode(return_value->value.str.val, return_value->value.str.len);
+	return_value->value.str.len = len;
 }
 /* }}} */