refix 961904

[merge]