Emergency bug fix