Bug fix 1.0.1