I think this resolves the email issues