Fixed bugs.

Signed-off-by: Serg Brych <sbrych@gmail.com>