fix #11 v1.0.40