Bug: Extras in the same folder auto select main feature external subtitles

When playing an extra file that sits alongside a movie in the same folder using the „-featurette" etc. naming convention, it will auto select the external subtitles (srt or ass) for the main title. This happens even when the extra has embedded subtitles. It is slightly annoying because it has to be turned off again for every extra. Can this be fixed?

Thanks