Really fixing it this time