fix #22
v1.0.39