[TO_STAGE] fix for bz970008

[merge]