Added correct -e option handlind