Work on issue #24