FIX: Causing subtitle loader issues

Merge back into single file
RE: 3.2.2