Fix bug838104 v1.0.1