fixed reuse issues
0.0.2