Fixed last merge mess