Emergency bug fix - 12/25