Really fix EDEADLK bug