Add some robustness
Version 0.0.6