fix double-callback issues
0.2.1