Bug fix after show all commit