Fixed last merge issue