v1.0.x: fix Error writing issue
v1.0.x: 1.0.1