Seems it's behaving correct now, surely more tests needed, but this is required for now to move forward.