Make sure titles are saved properly