fixes (also commit #200!)