Fix error caused by previous commit
Final version