Quickfix for issue #822