Fix -e behaviour