Fix email bug