diff --git a/src/structures/Guild.js b/src/structures/Guild.js
index 9353f4de5..2368ae626 100644
--- a/src/structures/Guild.js
+++ b/src/structures/Guild.js
@@ -861,7 +861,7 @@ class Guild extends Base {
     }
     if (data.afkTimeout) _data.afk_timeout = Number(data.afkTimeout);
     if (typeof data.icon !== 'undefined') _data.icon = data.icon;
-    if (data.owner) _data.owner_id = this.client.users.resolve(data.owner).id;
+    if (data.owner) _data.owner_id = this.client.users.resolveID(data.owner);
     if (data.splash) _data.splash = data.splash;
     if (data.banner) _data.banner = data.banner;
     if (typeof data.explicitContentFilter !== 'undefined') {
diff --git a/src/util/Util.js b/src/util/Util.js
index bc47ada47..bc2f0f811 100644
--- a/src/util/Util.js
+++ b/src/util/Util.js
@@ -567,7 +567,7 @@ class Util {
    * @returns {string}
    */
   static cleanCodeBlockContent(text) {
-    return text.replace('```', '`\u200b``');
+    return text.replace(/```/g, '`\u200b``');
   }
 
   /**