final touch for v0.8.9.0