add /e support