PIM-3364 : cosmetic in handlers