Fixed PIM-1495