wzg fixed BUG #6738 BUG #6674