wzg fixed bug 7921 7806 7980