Fix issue #819