Fixed quitting
Test