Work on issue #41