fix recursion issue
1.0.1