Bug fixed, but deadlock exists