Fix for highlighted option