PIM-3250 : re-work isset conditions