I really would like this fixed, please. I've been running into problems in the subtitles branch because of it.