Fixed #829