Shouldn't this be inside the conditional below?