fixed #838