fixed v1.2