fix of issue #767 v2