PIM-3054: Fix small bug