Fix issue #42