diff --git a/alib2/src/regexp/Alternation.cpp b/alib2/src/regexp/Alternation.cpp
index b7de7ca6d7636882d9a680712280b9dc57ac4ab2..1cf04c9af44a77644353101451b4be211659fab4 100644
--- a/alib2/src/regexp/Alternation.cpp
+++ b/alib2/src/regexp/Alternation.cpp
@@ -10,7 +10,6 @@
 
 namespace regexp {
 
-
 Alternation::Alternation(RegExpElement&& left, RegExpElement&& right) {
 	appendElement(std::move(left));
 	appendElement(std::move(right));
@@ -42,9 +41,12 @@ Alternation& Alternation::operator=(const Alternation& other) {
 	return *this;
 }
 
-Alternation& Alternation::operator=(Alternation&& other) noexcept {
+Alternation& Alternation::operator=(Alternation&& other) {
 	std::swap(this->elements, other.elements);
-	  
+	std::swap(this->parentRegExp, other.parentRegExp);
+	
+	this->attachRegExp(other.parentRegExp);
+	
 	return *this;
 }
 
@@ -126,6 +128,14 @@ bool Alternation::operator==(const Alternation& other) const {
 	return true;
 }
 
+void Alternation::operator>>(std::ostream& out) const {
+	out << "(Alternation";
+	for(const auto& e : elements)
+		out << " " << *e;
+
+	out << ")";
+}
+
 bool Alternation::testSymbol( const alphabet::Symbol & symbol ) const {
 	for(const auto& child : this->elements)
 		if(child->testSymbol(symbol)) return true;
@@ -146,14 +156,6 @@ void Alternation::computeMinimalAlphabet( std::set<alphabet::Symbol>& alphabet )
 		child->computeMinimalAlphabet(alphabet);
 }
 
-void Alternation::operator>>(std::ostream& out) const {
-	out << "(Alternation";
-	for(const auto& e : elements)
-		out << " " << *e;
-
-	out << ")";
-}
-
 bool Alternation::containsEmptyString() const {
 	for(const auto& e : elements)
 		if(e->containsEmptyString())
@@ -171,4 +173,3 @@ bool Alternation::isEmpty() const {
 }
 
 } /* namespace regexp */
-
diff --git a/alib2/src/regexp/Alternation.h b/alib2/src/regexp/Alternation.h
index 75fc1e3c5a599c1263c527944b1639306eccd8ae..5424fe016eee98f0204521bb6f63a88c2aff8e70 100644
--- a/alib2/src/regexp/Alternation.h
+++ b/alib2/src/regexp/Alternation.h
@@ -53,7 +53,7 @@ public:
 	Alternation(const Alternation& other);
 	Alternation(Alternation&& other) noexcept;
 	Alternation& operator =(const Alternation& other);
-	Alternation& operator =(Alternation&& other) noexcept;
+	Alternation& operator =(Alternation&& other);
 	virtual ~Alternation() noexcept;
 	
 	/**
diff --git a/alib2/src/regexp/Concatenation.cpp b/alib2/src/regexp/Concatenation.cpp
index 4faa19cd58f453e0cc35a8781d971e9125cc02ad..8b3aee33c225dc815e9bbcdd3273326712facecb 100644
--- a/alib2/src/regexp/Concatenation.cpp
+++ b/alib2/src/regexp/Concatenation.cpp
@@ -41,9 +41,12 @@ Concatenation& Concatenation::operator=(const Concatenation& other) {
 	return *this;
 }
 
-Concatenation& Concatenation::operator=(Concatenation&& other) noexcept {
+Concatenation& Concatenation::operator=(Concatenation&& other) {
 	std::swap(this->elements, other.elements);
+	std::swap(this->parentRegExp, other.parentRegExp);
   
+	this->attachRegExp(other.parentRegExp);
+	
 	return *this;
 }
 
@@ -141,6 +144,7 @@ bool Concatenation::testSymbol( const alphabet::Symbol & symbol ) const {
 
 bool Concatenation::attachRegExp(const RegExp * regexp ) {
 	if(this->parentRegExp == regexp) return true;
+	
 	this->parentRegExp = regexp;
 	for(const auto& child : this->elements)
 		if(!child->attachRegExp(regexp)) return false;
diff --git a/alib2/src/regexp/Concatenation.h b/alib2/src/regexp/Concatenation.h
index ade705b85a2c7dbc2628b2001688841facd0e957..f3cb0ad367933bfc06c6e69a3a3f72acb9aa1813 100644
--- a/alib2/src/regexp/Concatenation.h
+++ b/alib2/src/regexp/Concatenation.h
@@ -50,7 +50,7 @@ public:
 	Concatenation(const Concatenation& other);
 	Concatenation(Concatenation&& other) noexcept;
 	Concatenation& operator =(const Concatenation& other);
-	Concatenation& operator =(Concatenation&& other) noexcept;
+	Concatenation& operator =(Concatenation&& other);
 	virtual ~Concatenation() noexcept;
 	
 	/**
diff --git a/alib2/src/regexp/Iteration.cpp b/alib2/src/regexp/Iteration.cpp
index 51c364c6e2ee46acb8c8e201eca55cbdf3466b0b..27a470014ed96d6e060c21054cf7a48543b40a15 100644
--- a/alib2/src/regexp/Iteration.cpp
+++ b/alib2/src/regexp/Iteration.cpp
@@ -24,7 +24,7 @@ Iteration::Iteration(const Iteration& other) : element(other.element->clone()) {
 }
 
 Iteration::Iteration(Iteration&& other) noexcept : element(other.element) {
-	other.element = nullptr;
+	other.element = NULL;
 	this->attachRegExp(NULL);
 }
 
@@ -38,8 +38,11 @@ Iteration& Iteration::operator=(const Iteration& other) {
 	return *this;
 }
 
-Iteration& Iteration::operator=(Iteration&& other) noexcept {
+Iteration& Iteration::operator=(Iteration&& other) {
 	std::swap(this->element, other.element);
+	std::swap(this->parentRegExp, other.parentRegExp);
+	
+	this->attachRegExp(other.parentRegExp);
 
 	return *this;
 }
diff --git a/alib2/src/regexp/Iteration.h b/alib2/src/regexp/Iteration.h
index 6c04a1fa2c393b254deddd3a3297963e12a8cc99..f0eb5139e089bc4bb17e1e9356ef03cf40fe6a6e 100644
--- a/alib2/src/regexp/Iteration.h
+++ b/alib2/src/regexp/Iteration.h
@@ -50,7 +50,7 @@ public:
 	Iteration(const Iteration& other);
 	Iteration(Iteration&& other) noexcept;
 	Iteration& operator =(const Iteration& other);
-	Iteration& operator =(Iteration&& other) noexcept;
+	Iteration& operator =(Iteration&& other);
 	virtual ~Iteration() noexcept;
 
 	/**
diff --git a/alib2/src/regexp/RegExpEmpty.cpp b/alib2/src/regexp/RegExpEmpty.cpp
index 90fbf970acd07f3f0737efc243a5cf52a793ee9e..bcc13aaf6006312c197e2580a2516cb35330eef3 100644
--- a/alib2/src/regexp/RegExpEmpty.cpp
+++ b/alib2/src/regexp/RegExpEmpty.cpp
@@ -9,14 +9,28 @@
 
 namespace regexp {
   
-RegExpEmpty::RegExpEmpty(const RegExpEmpty& other) {
+RegExpEmpty::RegExpEmpty() {
+  // so that default constructor is available
+}
   
+RegExpEmpty::RegExpEmpty(const RegExpEmpty& other) {
+  // so that copy constructor is available
 }
 
-RegExpEmpty::RegExpEmpty(RegExpEmpty&& other) {
+RegExpEmpty::RegExpEmpty(RegExpEmpty&& other) noexcept {
   this->attachRegExp(NULL);
 }
 
+RegExpEmpty& RegExpEmpty::operator =(const RegExpEmpty& other) {
+  //this is actually different than default implementation
+  return *this;
+}
+
+RegExpEmpty& RegExpEmpty::operator =(RegExpEmpty&& other) noexcept {
+  //this is actually different than default implementation
+  return *this;
+}
+
 RegExpElement* RegExpEmpty::clone() const {
 	return new RegExpEmpty(*this);
 }
diff --git a/alib2/src/regexp/RegExpEmpty.h b/alib2/src/regexp/RegExpEmpty.h
index 1293b61c38c00d28d9be12de64adee496d866e03..64b28a08aadad7ee7e8f92ab6ee600277392b381 100644
--- a/alib2/src/regexp/RegExpEmpty.h
+++ b/alib2/src/regexp/RegExpEmpty.h
@@ -40,8 +40,11 @@ protected:
 	virtual void computeMinimalAlphabet( std::set<alphabet::Symbol>& alphabet ) const;
 
 public:
+	RegExpEmpty();
 	RegExpEmpty(const RegExpEmpty& other);
-	RegExpEmpty(RegExpEmpty&& other);
+	RegExpEmpty(RegExpEmpty&& other) noexcept;
+	RegExpEmpty& operator =(const RegExpEmpty& other);
+	RegExpEmpty& operator =(RegExpEmpty&& other) noexcept;
   
 	virtual bool operator<(const RegExpElement&) const;
 	virtual bool operator==(const RegExpElement&) const;
diff --git a/alib2/src/regexp/RegExpEpsilon.cpp b/alib2/src/regexp/RegExpEpsilon.cpp
index 0984e2ec81e2f874a26ab7fb5c47784d6f0b7c8a..f4d004a876f7bfcd2dfd7a82e357d2bab9e01d20 100644
--- a/alib2/src/regexp/RegExpEpsilon.cpp
+++ b/alib2/src/regexp/RegExpEpsilon.cpp
@@ -9,13 +9,27 @@
 
 namespace regexp {
   
-RegExpEpsilon::RegExpEpsilon(const RegExpEpsilon& other) {
+RegExpEpsilon::RegExpEpsilon() {
+  // so that default constructor is available
+}
   
+RegExpEpsilon::RegExpEpsilon(const RegExpEpsilon& other) {
+  // so that copy constructor is available
 }
 
-RegExpEpsilon::RegExpEpsilon(RegExpEpsilon&& other) {
+RegExpEpsilon::RegExpEpsilon(RegExpEpsilon&& other) noexcept {
 	this->attachRegExp(NULL);
 }
+
+RegExpEpsilon& RegExpEpsilon::operator =(const RegExpEpsilon& other) {
+  //this is actually different than default implementation
+  return *this;
+}
+
+RegExpEpsilon& RegExpEpsilon::operator =(RegExpEpsilon&& other) noexcept {
+  //this is actually different than default implementation
+  return *this;
+}
   
 RegExpElement* RegExpEpsilon::clone() const {
 	return new RegExpEpsilon(*this);
diff --git a/alib2/src/regexp/RegExpEpsilon.h b/alib2/src/regexp/RegExpEpsilon.h
index 56c2a76cc029e67b43ec85f1eb21113f72fe93b5..f36f3f25e48a7fa3380f2a65c3310950b7b61c4d 100644
--- a/alib2/src/regexp/RegExpEpsilon.h
+++ b/alib2/src/regexp/RegExpEpsilon.h
@@ -41,8 +41,11 @@ protected:
 
 public:
   
+	RegExpEpsilon();
 	RegExpEpsilon(const RegExpEpsilon& other);
-	RegExpEpsilon(RegExpEpsilon&& other);
+	RegExpEpsilon(RegExpEpsilon&& other) noexcept;
+	RegExpEpsilon& operator=(const RegExpEpsilon& other);
+	RegExpEpsilon& operator=(RegExpEpsilon&& other) noexcept;
 	
 	virtual bool operator<(const RegExpElement&) const;
 	virtual bool operator==(const RegExpElement&) const;
diff --git a/alib2/src/regexp/RegExpSymbol.cpp b/alib2/src/regexp/RegExpSymbol.cpp
index 118340a1013e3d487641da26d99cefd6fdb18f4f..d2d2ad2930d8dc430cb5abae3d1f921551138bf7 100644
--- a/alib2/src/regexp/RegExpSymbol.cpp
+++ b/alib2/src/regexp/RegExpSymbol.cpp
@@ -13,10 +13,29 @@ RegExpSymbol::RegExpSymbol(const RegExpSymbol& other) : alphabet::Symbol(other.s
   
 }
 
-RegExpSymbol::RegExpSymbol(RegExpSymbol&& other) : alphabet::Symbol(std::move(other.symbol)) {
+RegExpSymbol::RegExpSymbol(RegExpSymbol&& other) noexcept : alphabet::Symbol(std::move(other.symbol)) {
 	this->attachRegExp(NULL);
 }
 
+RegExpSymbol& RegExpSymbol::operator=(const RegExpSymbol& other) {
+  	if (this == &other) {
+		return *this;
+	}
+
+	*this = RegExpSymbol(other);
+
+	return *this;
+}
+
+RegExpSymbol& RegExpSymbol::operator=(RegExpSymbol&& other) {
+	std::swap(this->symbol, other.symbol);
+	std::swap(this->parentRegExp, other.parentRegExp);
+	
+	this->attachRegExp(other.parentRegExp);
+	
+	return *this;
+}
+
 RegExpSymbol::RegExpSymbol(const std::string& symbol) :
 		alphabet::Symbol(symbol) {
 }
diff --git a/alib2/src/regexp/RegExpSymbol.h b/alib2/src/regexp/RegExpSymbol.h
index 0fa85b0b198f8bb8d96f298f04e20b0592134e4d..e94d40bc9b1ba228258e7d2d723cbecbc5cc3de4 100644
--- a/alib2/src/regexp/RegExpSymbol.h
+++ b/alib2/src/regexp/RegExpSymbol.h
@@ -45,7 +45,9 @@ public:
 	RegExpSymbol(std::string&& symbol);
 	
 	RegExpSymbol(const RegExpSymbol& other);
-	RegExpSymbol(RegExpSymbol&& other);
+	RegExpSymbol(RegExpSymbol&& other) noexcept;
+	RegExpSymbol& operator=(const RegExpSymbol& other);
+	RegExpSymbol& operator=(RegExpSymbol&& other);
 	
 	bool operator==(const alphabet::Symbol&) const;
 	friend bool operator==(const alphabet::Symbol&, const RegExpSymbol&);