[FIX] more readable code (RT-2525)