fixe bug for shachar..  sorry