Elimanated a deadlock BUG.