Fix of issue #4