Fix bug on case 1