Item 7. for issue #1081