Fix issue 833.