Fix bug from feature