Hope to fix deadlock