Fix issue 847