Major bug fix!