Re attempt at fixing titles