Fixed the deadlock issue