fixed v1 bug, version: v1.1