Exit status fix