Fix of issue#6