deadlock fixed?