Fix of issue #73