commit with 2 issues fixe #4