Fix of issue #717 Co-authored-by: sandra <sandra.rossi@gmail.com> Co-authored-by: Lars Hvam <larshp@hotmail.com>