revert * branch treatment. probably still hidden problem somewhere, as i forgot what was the case i "fixed" it for