diff --git a/src/Discord.Net.Commands/ModuleBase.cs b/src/Discord.Net.Commands/ModuleBase.cs
index 808a26caa..9be7d1aeb 100644
--- a/src/Discord.Net.Commands/ModuleBase.cs
+++ b/src/Discord.Net.Commands/ModuleBase.cs
@@ -8,23 +8,14 @@ namespace Discord.Commands
     public abstract class ModuleBase<T> : IModuleBase
         where T : class, ICommandContext
     {
-        public T Context
-        {
-            get { return _context; }
-            private set
-            {
-                _context = value;
-                ContextSet();
-            }
-        }
-        private T _context;
+        public T Context { get; private set; }
 
         protected virtual async Task<IUserMessage> ReplyAsync(string message, bool isTTS = false, Embed embed = null, RequestOptions options = null)
         {
             return await Context.Channel.SendMessageAsync(message, isTTS, embed, options).ConfigureAwait(false);
         }
         
-        protected virtual void ContextSet()
+        protected virtual void OnContextSet()
         {
         }
 
@@ -35,6 +26,7 @@ namespace Discord.Commands
             if (newValue == null)
                 throw new InvalidOperationException($"Invalid context type. Expected {typeof(T).Name}, got {context.GetType().Name}");
             Context = newValue;
+            OnContextSet();
         }
     }
 }