Really fixes email bug