more fixes 0.3.2