Fix of issue #720

Issue #720