Avoid crash reported in issue #86