propsed fix to 846 See merge request !524
mentioned in issue #847 (closed)
mentioned in issue #848 (closed)