Work on issue #40