diff --git a/UnitTest++/ParameterizedManager.cpp b/UnitTest++/ParameterizedManager.cpp
index 4d42ccb..ca92661 100644
--- a/UnitTest++/ParameterizedManager.cpp
+++ b/UnitTest++/ParameterizedManager.cpp
@@ -44,17 +44,6 @@ TestListNode* const ParameterizedManager::retrieveTest(TestDetails const * const
 }
 
 
-Test* const ParameterizedManager::getCurrentTest() const
-{
-	if (_currentTest == nullptr)
-	{
-		return nullptr;
-	}
-
-	return _currentTest->m_test;
-}
-
-
 bool ParameterizedManager::isCurrentTest(TestDetails const * const details) const
 {
 	if (_currentTest == nullptr)
diff --git a/UnitTest++/ParameterizedManager.h b/UnitTest++/ParameterizedManager.h
index 5183269..ab70e2d 100644
--- a/UnitTest++/ParameterizedManager.h
+++ b/UnitTest++/ParameterizedManager.h
@@ -15,7 +15,7 @@ namespace UnitTest
 	{
 	public:
 		static ParameterizedManager & getInstance();
-		Test* const getCurrentTest() const;
+		TestListNode* const getCurrentTest() const { return _currentTest; }
 		bool isCurrentTest(TestDetails const * const details) const;
 		void beginExecute(TestDetails const * const details);
 		void endExecute(TestDetails const * const details);
diff --git a/UnitTest++/TestParameter.cpp b/UnitTest++/TestParameter.cpp
index fb43d54..6564ce1 100644
--- a/UnitTest++/TestParameter.cpp
+++ b/UnitTest++/TestParameter.cpp
@@ -61,7 +61,7 @@ void TestParameterAbstract::nextIndex(bool first)
 		_index++;
 	}
 
-	peekCurrent(&ParameterizedManager::getInstance().getCurrentTest()->m_details, _index);
+	peekCurrent(&ParameterizedManager::getInstance().getCurrentTest()->m_test->m_details, _index);
 }