Bug fix after merge