New additions to subtitle fix

Seems like my last fix did not work completely. I solved the issue with
this commit, to be merged in patch-2 branch asap.