LERGO-256 - fixing bugs.