Fixed email parsing issue