Fix of issue #80