GuangluWu slight change for v0.8.0