Fix issue #884.