[FIX] Missing part of the fix 5f6fc4735a9a09c350dbbb789f3d39000ca3601c

@mart-e