Fixed minor merge mishap