#358: hotfix