Deadlock issue fixed?!