Fix in sprint 2