BugFix: Fixed hang