Addition for issue #2.