Fix of issue #42