Fix the Terminal-Crash-Bug