diff --git a/final/eventloop/monitor.h b/final/eventloop/monitor.h
index 40d198db..ffcecff9 100644
--- a/final/eventloop/monitor.h
+++ b/final/eventloop/monitor.h
@@ -164,12 +164,12 @@ inline auto Monitor::getFileDescriptor() const -> int
 
 //----------------------------------------------------------------------
 template <typename T>
-inline auto Monitor::getUserContext() const -> clean_fdata_t<T>&
+auto Monitor::getUserContext() const -> clean_fdata_t<T>&
 {
-  auto empty = static_cast<T>(0);
+  static T empty_lvalue = T{};
   return user_context
        ? static_cast<FData<clean_fdata_t<T>>&>(*user_context).get()
-       : empty;
+       : empty_lvalue;
 }
 
 //----------------------------------------------------------------------
diff --git a/test/eventloop-monitor-test.cpp b/test/eventloop-monitor-test.cpp
index a23b969c..eca234df 100644
--- a/test/eventloop-monitor-test.cpp
+++ b/test/eventloop-monitor-test.cpp
@@ -569,6 +569,11 @@ void EventloopMonitorTest::noArgumentTest()
   CPPUNIT_ASSERT ( m.getUserContext<int*>() == nullptr );
   CPPUNIT_ASSERT ( m.getUserContext<long>() == 0 );
   CPPUNIT_ASSERT ( m.getUserContext<long*>() == nullptr );
+  CPPUNIT_ASSERT ( m.getUserContext<double>() == 0.0 );
+  CPPUNIT_ASSERT ( m.getUserContext<double*>() == nullptr );
+  CPPUNIT_ASSERT ( m.getUserContext<finalcut::FPoint>() == finalcut::FPoint() );
+  CPPUNIT_ASSERT ( m.getUserContext<finalcut::FPoint>() == finalcut::FPoint(0, 0) );
+  CPPUNIT_ASSERT ( m.getUserContext<finalcut::FPoint>() != finalcut::FPoint(1, 2) );
   CPPUNIT_ASSERT ( m.getUserContext<std::size_t>() == 0 );
   CPPUNIT_ASSERT ( m.getUserContext<std::size_t*>() == nullptr );
   CPPUNIT_ASSERT ( ! m.isActive() );