final bug fix... I think