Bug with exit is fixed once and for all