diff --git a/Zend/zend.h b/Zend/zend.h
index 27caadc51cb..09db94d8366 100644
--- a/Zend/zend.h
+++ b/Zend/zend.h
@@ -696,7 +696,10 @@ END_EXTERN_C()
 		zval *_zv = (zv);								\
 		if (Z_REFCOUNTED_P(_zv)) {						\
 			if (Z_REFCOUNT_P(_zv) > 1) {				\
-				if (Z_TYPE_P(_zv) == IS_OBJECT ||		\
+				if (Z_ISREF_P(_zv)) {					\
+					Z_DELREF_P(_zv);					\
+					ZVAL_DUP(_zv, Z_REFVAL_P(_zv));		\
+				} else if (Z_TYPE_P(_zv) == IS_OBJECT ||\
 				    Z_TYPE_P(_zv) == IS_RESOURCE) {		\
 					Z_ADDREF_P(_zv);					\
 				} else {								\
diff --git a/Zend/zend_object_handlers.c b/Zend/zend_object_handlers.c
index de5da28e6a6..2205ab2f1e3 100644
--- a/Zend/zend_object_handlers.c
+++ b/Zend/zend_object_handlers.c
@@ -638,9 +638,10 @@ found:
 	} else if (EXPECTED(property_info != NULL)) {
 		/* if we assign referenced variable, we should separate it */
 		if (IS_REFCOUNTED(Z_TYPE_P(value))) {
-			Z_ADDREF_P(value);
 			if (Z_ISREF_P(value)) {
-				SEPARATE_ZVAL(value);
+				ZVAL_DUP(value, Z_REFVAL_P(value));
+			} else {
+				Z_ADDREF_P(value);
 			}
 		}
 		if (EXPECTED((property_info->flags & ZEND_ACC_STATIC) == 0) &&