fixed #869