Possible fix for issue #42