update for mail bug