fixed #826