Fixes subscription handling