wzg fixed BUG #6301