Work on issue #2