Improved issue #1.