diff --git a/akka-core/src/main/scala/actor/Actor.scala b/akka-core/src/main/scala/actor/Actor.scala
index 309d45600a..6c75c3bd10 100644
--- a/akka-core/src/main/scala/actor/Actor.scala
+++ b/akka-core/src/main/scala/actor/Actor.scala
@@ -215,6 +215,7 @@ trait Actor extends TransactionManagement {
   @volatile private[this] var _isEventBased: Boolean = false
   @volatile private[akka] var _isKilled = false
 
+  // TODO: rename to dispatching lock and only use for dispatching decisions?
   private[akka] val lock = new ReentrantLock
 
   private var _hotswap: Option[PartialFunction[Any, Unit]] = None