Fix a new bug