diff --git a/phongo_compat.h b/phongo_compat.h
index fc2c8d6a..bf29c821 100644
--- a/phongo_compat.h
+++ b/phongo_compat.h
@@ -161,6 +161,7 @@
 # define ZEND_HASH_APPLY_COUNT(ht) (ht)->u.v.nApplyCount
 # define PHONGO_RETVAL_STRINGL(s, slen) RETVAL_STRINGL(s, slen)
 # define PHONGO_RETURN_STRINGL(s, slen) RETVAL_STRINGL(s, slen)
+# define PHONGO_RETURN_STRING(s) RETVAL_STRING(s)
 #else
 # define phongo_char char
 # define phongo_char_pdup(str) pestrdup(filename, 1)
@@ -181,6 +182,7 @@
 # define ZEND_HASH_APPLY_COUNT(ht) (ht)->nApplyCount
 # define PHONGO_RETVAL_STRINGL(s, slen) RETVAL_STRINGL(s, slen, 1)
 # define PHONGO_RETURN_STRINGL(s, slen) RETVAL_STRINGL(s, slen, 1)
+# define PHONGO_RETURN_STRING(s) RETVAL_STRING(s, 1)
 #endif
 
 
diff --git a/src/MongoDB/Server.c b/src/MongoDB/Server.c
index e7ef8f3f..2196a69d 100644
--- a/src/MongoDB/Server.c
+++ b/src/MongoDB/Server.c
@@ -147,7 +147,7 @@ PHP_METHOD(Server, getHost)
 	}
 
 	if ((sd = mongoc_topology_description_server_by_id(&intern->client->topology->description, intern->server_id, &error))) {
-		RETURN_STRING(sd->host.host, 1);
+		PHONGO_RETURN_STRING(sd->host.host);
 	}
 
 	phongo_throw_exception(PHONGO_ERROR_RUNTIME TSRMLS_CC, "Failed to get server description: %s", error.message);
diff --git a/src/MongoDB/WriteConcernError.c b/src/MongoDB/WriteConcernError.c
index 377c9d5a..05392ff4 100644
--- a/src/MongoDB/WriteConcernError.c
+++ b/src/MongoDB/WriteConcernError.c
@@ -95,7 +95,7 @@ PHP_METHOD(WriteConcernError, getMessage)
 		return;
 	}
 
-	RETURN_STRING(intern->message, 1);
+	PHONGO_RETURN_STRING(intern->message);
 }
 /* }}} */
 
diff --git a/src/MongoDB/WriteError.c b/src/MongoDB/WriteError.c
index 06c1cafe..09ed8d4a 100644
--- a/src/MongoDB/WriteError.c
+++ b/src/MongoDB/WriteError.c
@@ -94,7 +94,7 @@ PHP_METHOD(WriteError, getMessage)
 	}
 
 
-	RETURN_STRING(intern->message, 1);
+	PHONGO_RETURN_STRING(intern->message);
 }
 /* }}} */
 /* {{{ proto mixed WriteError::getInfo()