PIM-2496 Fixed spec