fixed PIM-1229