diff --git a/alib2algo/src/automaton/EpsilonClosure.cpp b/alib2algo/src/automaton/EpsilonClosure.cpp
index 318bcf5a399c0c9b5e475f3b65503ab5d256d068..39ad0e422141659bfc7b4fe0996b20576720b414 100644
--- a/alib2algo/src/automaton/EpsilonClosure.cpp
+++ b/alib2algo/src/automaton/EpsilonClosure.cpp
@@ -40,10 +40,11 @@ std::set<automaton::State> EpsilonClosure::epsilonClosure( const automaton::Epsi
 		visited[ p ] = true;
 		closure.insert( p );
 
-		for( const auto & transition : fsm.getEpsilonTransitionsFromState( p ) )
-			for (const auto & to : transition.second )
-				if( visited [ to ] == false )
-					queue.push( to );
+		for( const auto & transition : fsm.getTransitions( ) )
+			if( transition.first.second.is<string::Epsilon>() && transition.first.first == p)
+				for (const auto & to : transition.second )
+					if( visited [ to ] == false )
+						queue.push( to );
 	}
 
 	return closure;
@@ -83,8 +84,8 @@ std::set<automaton::State> EpsilonClosure::epsilonClosure( const automaton::Exte
 		visited[ p ] = true;
 		closure.insert( p );
 
-		for( const auto & transition : fsm.getTransitionsFromState( p ) )
-			if( regexp::RegExpEpsilon::languageContainsEpsilon( transition.first.second ) )
+		for( const auto & transition : fsm.getTransitions( ) )
+			if( transition.first.first == p && regexp::RegExpEpsilon::languageContainsEpsilon( transition.first.second ) )
 				for (const auto & to : transition.second )
 					if( visited [ to ] == false )
 						queue.push( to );
@@ -111,8 +112,8 @@ std::set<automaton::State> EpsilonClosure::epsilonClosure( const automaton::Comp
 		visited[ p ] = true;
 		closure.insert( p );
 
-		for( const auto & transition : fsm.getTransitionsFromState( p ) )
-			if( transition.first.second.getContent().size() != 0 )
+		for( const auto & transition : fsm.getTransitions( ) )
+			if( transition.first.first == p && transition.first.second.getContent().size() == 0 )
 				for (const auto & to : transition.second )
 					if( visited [ to ] == false )
 						queue.push( to );