diff --git a/ActivityStore.cs b/ActivityStore.cs
index 661a8df..df400da 100644
--- a/ActivityStore.cs
+++ b/ActivityStore.cs
@@ -154,9 +154,9 @@ public class ActivityStore {
     if (newActivity is IntransitiveActivity) {
       // intransitive activities go here
       IntransitiveActivity activity = (IntransitiveActivity)newActivity;
-      if (activity is Question)             return Question((Question)activity);
-      else if (activity is Arrive)          return Arrive((Arrive)activity);
+      if (activity is Arrive)          return Arrive((Arrive)activity);
       else if (activity is Travel)          return Travel((Travel)activity);
+      // else if (activity is Question)             return Question((Question)activity); // TODO: Temporary until question is intransitory again
       else throw new InvalidOperationException($"Activity type '{activity.Type?.FirstOrDefault()}' is unrecognized");
 
     }
@@ -188,6 +188,7 @@ public class ActivityStore {
       else if (activity is TentativeReject) return TentativeReject((TentativeReject)activity);
       else if (activity is TentativeAccept) return TentativeAccept((TentativeAccept)activity);
       else if (activity is View)            return View((View)activity);
+      else if (activity is Question) return Question((Question)activity); // TODO: Temporary until question is intransitory again
       else throw new InvalidOperationException($"Activity type '{activity.Type?.FirstOrDefault()}' is unrecognized");
     }
   }