Work on issue #16