BugFix: Hanging thread