* fix issue Signed-off-by: wind57 <eugen.rabii@gmail.com> * refactor Signed-off-by: wind57 <eugen.rabii@gmail.com> * fix issue Signed-off-by: wind57 <eugen.rabii@gmail.com> * review comments Signed-off-by: wind57 <eugen.rabii@gmail.com> --------- Signed-off-by: wind57 <eugen.rabii@gmail.com>