Fixed Thread-End-Bug