Fix for email parsing