fixed email matching