little modify for v0.5