Address issue #42