Fixed exit part two ...