fixed bugs

Signed-off-by: Денис <Денис@emp-513-02.oat.local>