fixed robustness issues
1.0.0