Fixed tag reset issue