onceFix: fixed infinite loop issue invoking once() method.

Could you please merge this branch with only once commit please.