Fixed use case 1.8