Fixing another deadlock