fixed email & _ dependencies