Add test and fix for issue 1891.