Fix issue with option titles