Fix of issue #90