Fixed bug from merging