wzg fixed bugs