bug fix - after the latest bug fix we got infinite loop in some cases.
Now both issues are OK.