Fix email issue