PIM-3531: fix static analysis