fix for bz970008

[merge]