Fix issue 817