diff --git a/lib/Structures/ChannelPermissions.js b/lib/Structures/ChannelPermissions.js
index 81773a75e..046064d2e 100644
--- a/lib/Structures/ChannelPermissions.js
+++ b/lib/Structures/ChannelPermissions.js
@@ -20,31 +20,13 @@ var ChannelPermissions = (function () {
 			return _this.hasPermission(perm, explicit);
 		};
 
-		return {
-			// general
-			createInstantInvite: hp(_Constants.Permissions.createInstantInvite),
-			kickMembers: hp(_Constants.Permissions.kickMembers),
-			banMembers: hp(_Constants.Permissions.banMembers),
-			managePermissions: hp(_Constants.Permissions.managePermissions),
-			manageChannel: hp(_Constants.Permissions.manageChannel),
-			manageServer: hp(_Constants.Permissions.manageServer),
-			// text
-			readMessages: hp(_Constants.Permissions.readMessages),
-			sendMessages: hp(_Constants.Permissions.sendMessages),
-			sendTTSMessages: hp(_Constants.Permissions.sendTTSMessages),
-			manageMessages: hp(_Constants.Permissions.manageMessages),
-			embedLinks: hp(_Constants.Permissions.embedLinks),
-			attachFiles: hp(_Constants.Permissions.attachFiles),
-			readMessageHistory: hp(_Constants.Permissions.readMessageHistory),
-			mentionEveryone: hp(_Constants.Permissions.mentionEveryone),
-			// voice
-			voiceConnect: hp(_Constants.Permissions.voiceConnect),
-			voiceSpeak: hp(_Constants.Permissions.voiceSpeak),
-			voiceMuteMembers: hp(_Constants.Permissions.voiceMuteMembers),
-			voiceDeafenMembers: hp(_Constants.Permissions.voiceDeafenMembers),
-			voiceMoveMembers: hp(_Constants.Permissions.voiceMoveMembers),
-			voiceUseVAD: hp(_Constants.Permissions.voiceUseVAD)
-		};
+		var json = {};
+
+		for (var permission in _Constants.Permissions) {
+			json[permission] = hp(_Constants.Permissions[permission]);
+		}
+
+		return json;
 	};
 
 	ChannelPermissions.prototype.serialize = function serialize() {
diff --git a/src/Structures/ChannelPermissions.js b/src/Structures/ChannelPermissions.js
index 9cdccdb7d..f4c869488 100644
--- a/src/Structures/ChannelPermissions.js
+++ b/src/Structures/ChannelPermissions.js
@@ -11,31 +11,13 @@ export default class ChannelPermissions {
 
 		var hp = (perm) => this.hasPermission(perm, explicit);
 
-		return {
-			// general
-			createInstantInvite : hp( Permissions.createInstantInvite ),
-			kickMembers : hp( Permissions.kickMembers ),
-			banMembers : hp( Permissions.banMembers ),
-			managePermissions : hp ( Permissions.managePermissions ),
-			manageChannel : hp( Permissions.manageChannel ),
-			manageServer : hp( Permissions.manageServer ),
-			// text
-			readMessages : hp( Permissions.readMessages ),
-			sendMessages : hp( Permissions.sendMessages ),
-			sendTTSMessages : hp( Permissions.sendTTSMessages ),
-			manageMessages : hp( Permissions.manageMessages ),
-			embedLinks : hp( Permissions.embedLinks ),
-			attachFiles : hp( Permissions.attachFiles ),
-			readMessageHistory : hp( Permissions.readMessageHistory ),
-			mentionEveryone : hp( Permissions.mentionEveryone ),
-			// voice
-			voiceConnect : hp( Permissions.voiceConnect ),
-			voiceSpeak : hp( Permissions.voiceSpeak ),
-			voiceMuteMembers : hp( Permissions.voiceMuteMembers ),
-			voiceDeafenMembers : hp( Permissions.voiceDeafenMembers ),
-			voiceMoveMembers : hp( Permissions.voiceMoveMembers ),
-			voiceUseVAD : hp( Permissions.voiceUseVAD )
-		};
+		var json = {};
+
+		for(var permission in Permissions) {
+			json[permission] = hp( Permissions[permission] );
+		}
+
+		return json;
 	}
 
 	serialize(){