Fixed bad variable from merge