Fix new bug