Modify for v1.0.2