Behaviour improvement.

Signed-off-by: Kiril Nesenko <nesenko@gmail.com>