Fix bug from previous commit