Fixed issue #42