fix even more hang situations due to client_mutex