Fixed minor bug from merge