Fixed PIM-1447
Fixed PIM-1446