Fix bug from prior changes