Fixed crashing on -e when finished