Another try at fixing the exit status