fix for bug#956117

[merge]