Bug fix after compare