Fix of issue #3