fix for bug918947

[merge]