#22 Fixed bug that returned after the branch merge