Final bug fix... I think