fixing my own fuckery