Fix more exciting fuckery