More fixes in adding a new bug