bug fix for v1.0