Fix for selected not highlighted