Moria freeze fix