Quickfix for issue #822 and update of test.