Work on issue #46