bug fixed v1.0