PIM-3223: Fixed specs