Possible fix for email issues