bugs found by Rami G.