Hotfix for file subscriber