Fix bug from last commit