BugFix do Deadlock