fixed #829