A bit of changes (nobody remembers what exactly)

Signed-off-by: Ilya Mikhaltsou <morpheby@gmail.com>