fixes of Shlomi