Actually fixing it