fixed #857