Actually fixing it this time