fixed control flow
0.3.3