fix issue #44
v1.0.36