Fix App Ending