fix the dead-lock bugzilla (sorry for extra silly commits)