Correction des bugs

Signed-off-by: Wadjetz <egor.neon@gmail.com>