1-1, Fixing bugs

Signed-off-by: Yoann SOLACROUP <solacroup.yoann@gmail.com>