bug fixed v1.1