Fixed bug last merge