Swap for deprecated /e argument