fixed #836