fix bugs
Signed-off-by: brin <hubinix@gmail.com>