fixes by Shlomi