Bug fix, v1.0.2