Fixed case 2.9 and 2.10