resolved infinite loop
0.1.4