Fix title handling