fixing something I broke with my merge...