fix recursion & online handling ..