Fixing case 2