Fix bug from last release