work on #829