Fix issue 828