First bug fix!