fix bug946730 - (Revise 1)