Maybe fixing it this time