diff --git a/libs/ardour/ardour/pan_controllable.h b/libs/ardour/ardour/pan_controllable.h
index 988492972f..407b750beb 100644
--- a/libs/ardour/ardour/pan_controllable.h
+++ b/libs/ardour/ardour/pan_controllable.h
@@ -37,12 +37,11 @@ class Pannable;
 class LIBARDOUR_API PanControllable : public AutomationControl
 {
   public:
-#warning NUTEMPO QUESTION what time domain shoudl this really use?
-	PanControllable (Session& s, std::string name, Pannable* o, Evoral::Parameter param)
+	PanControllable (Session& s, std::string name, Pannable* o, Evoral::Parameter param, Temporal::TimeDomain td)
 		: AutomationControl (s,
 		                     param,
 		                     ParameterDescriptor(param),
-		                     boost::shared_ptr<AutomationList>(new AutomationList(param, Temporal::AudioTime)),
+		                     boost::shared_ptr<AutomationList>(new AutomationList(param, td)),
 		                     name)
 		, owner (o)
 	{}
diff --git a/libs/ardour/automatable.cc b/libs/ardour/automatable.cc
index d5697b47ba..93261651be 100644
--- a/libs/ardour/automatable.cc
+++ b/libs/ardour/automatable.cc
@@ -567,7 +567,7 @@ Automatable::control_factory(const Evoral::Parameter& param)
 	} else if (param.type() == PanAzimuthAutomation || param.type() == PanWidthAutomation || param.type() == PanElevationAutomation) {
 		Pannable* pannable = dynamic_cast<Pannable*>(this);
 		if (pannable) {
-			control = new PanControllable (_a_session, describe_parameter (param), pannable, param);
+			control = new PanControllable (_a_session, describe_parameter (param), pannable, param, time_domain());
 		} else {
 			warning << "PanAutomation for non-Pannable" << endl;
 		}
diff --git a/libs/ardour/pannable.cc b/libs/ardour/pannable.cc
index 1fb2ee8a52..003d3144a3 100644
--- a/libs/ardour/pannable.cc
+++ b/libs/ardour/pannable.cc
@@ -42,11 +42,11 @@ using namespace ARDOUR;
 Pannable::Pannable (Session& s, Temporal::TimeDomain td)
 	: Automatable (s, td)
 	, SessionHandleRef (s)
-	, pan_azimuth_control (new PanControllable (s, "", this, PanAzimuthAutomation))
-	, pan_elevation_control (new PanControllable (s, "", this, PanElevationAutomation))
-	, pan_width_control (new PanControllable (s, "", this, PanWidthAutomation))
-	, pan_frontback_control (new PanControllable (s, "", this, PanFrontBackAutomation))
-	, pan_lfe_control (new PanControllable (s, "", this, PanLFEAutomation))
+	, pan_azimuth_control (new PanControllable (s, "", this, PanAzimuthAutomation, td))
+	, pan_elevation_control (new PanControllable (s, "", this, PanElevationAutomation, td))
+	, pan_width_control (new PanControllable (s, "", this, PanWidthAutomation, td))
+	, pan_frontback_control (new PanControllable (s, "", this, PanFrontBackAutomation, td))
+	, pan_lfe_control (new PanControllable (s, "", this, PanLFEAutomation, td))
 	, _auto_state (Off)
 	, _has_state (false)
 	, _responding_to_control_auto_state_change (0)