fixed v1.8.7