fix for email issues