diff --git a/alib2algo/src/automaton/convert/ToPostfixPushdownAutomaton.cpp b/alib2algo/src/automaton/convert/ToPostfixPushdownAutomaton.cpp
index f67754dd4895f56c0e9db1371607089954d5075c..5c103461b1eb0a1bb1f051056ac389b8b5683f6d 100644
--- a/alib2algo/src/automaton/convert/ToPostfixPushdownAutomaton.cpp
+++ b/alib2algo/src/automaton/convert/ToPostfixPushdownAutomaton.cpp
@@ -36,16 +36,16 @@ automaton::DPDA < > ToPostfixPushdownAutomaton::convert ( const automaton::DFTA
 	automaton.addInputSymbol(alphabet::EndSymbol::instance < DefaultSymbolType > ( ));
 
 	for (const auto & state : dfta.getStates()) {
-		automaton.addPushdownStoreSymbol(DefaultSymbolType(state.getData()));
+		automaton.addPushdownStoreSymbol(state);
 	}
 
 	for (const auto & transition : dfta.getTransitions()) {
 		ext::vector<DefaultSymbolType> pop;
 		pop.reserve(transition.first.second.size());
 		for (const auto & state : transition.first.second) {
-			pop.push_back(DefaultSymbolType(state.getData()));
+			pop.push_back(state);
 		}
-		ext::vector<DefaultSymbolType> push (1, DefaultSymbolType(transition.second.getData()));
+		ext::vector<DefaultSymbolType> push (1, transition.second);
 		automaton.addTransition(automaton.getInitialState(), DefaultSymbolType(alphabet::RankedSymbol<>(transition.first.first)), pop, automaton.getInitialState(), push);
 	}
 
@@ -54,7 +54,7 @@ automaton::DPDA < > ToPostfixPushdownAutomaton::convert ( const automaton::DFTA
 	automaton.addFinalState(finalPDAState);
 
 	for (const auto & finalState : dfta.getFinalStates()) {
-		ext::vector<DefaultSymbolType> pop = {alphabet::BottomOfTheStackSymbol::instance<DefaultSymbolType>(), DefaultSymbolType(finalState.getData())};
+		ext::vector<DefaultSymbolType> pop = {alphabet::BottomOfTheStackSymbol::instance<DefaultSymbolType>(), finalState};
 		ext::vector<DefaultSymbolType> push;
 		automaton.addTransition(automaton.getInitialState(), alphabet::EndSymbol::instance<DefaultSymbolType>(), pop, finalPDAState, push);
 	}
@@ -71,7 +71,7 @@ automaton::NPDA < > ToPostfixPushdownAutomaton::convert ( const automaton::NFTA
 	automaton.addInputSymbol(alphabet::EndSymbol::instance < DefaultSymbolType > ( ));
 
 	for (const auto & state : nfta.getStates()) {
-		automaton.addPushdownStoreSymbol(DefaultSymbolType(state.getData()));
+		automaton.addPushdownStoreSymbol(state);
 	}
 
 	for (const auto & transition : nfta.getTransitions()) {
@@ -79,9 +79,9 @@ automaton::NPDA < > ToPostfixPushdownAutomaton::convert ( const automaton::NFTA
 			ext::vector <DefaultSymbolType> pop;
 			pop.reserve(transition.first.second.size());
 			for (const auto & state : transition.first.second) {
-				pop.push_back(DefaultSymbolType(state.getData()));
+				pop.push_back(state);
 			}
-			ext::vector <DefaultSymbolType> push(1, DefaultSymbolType(toState.getData()));
+			ext::vector <DefaultSymbolType> push(1, toState);
 			automaton.addTransition(automaton.getInitialState(), DefaultSymbolType(alphabet::RankedSymbol<>(transition.first.first)), pop, automaton.getInitialState(), push);
 		}
 	}
@@ -91,7 +91,7 @@ automaton::NPDA < > ToPostfixPushdownAutomaton::convert ( const automaton::NFTA
 	automaton.addFinalState(finalPDAState);
 
 	for (const auto & finalState : nfta.getFinalStates()) {
-		ext::vector<DefaultSymbolType> pop = {alphabet::BottomOfTheStackSymbol::instance<DefaultSymbolType>(), DefaultSymbolType(finalState.getData())};
+		ext::vector<DefaultSymbolType> pop = {alphabet::BottomOfTheStackSymbol::instance<DefaultSymbolType>(), finalState};
 		ext::vector<DefaultSymbolType> push;
 		automaton.addTransition(automaton.getInitialState(), alphabet::EndSymbol::instance<DefaultSymbolType>(), pop, finalPDAState, push);
 	}