Second bug fix