Fix with exit