Maybe fixing things