Fix new bug from last commit