fixes by Shlomig