Fix case 2