fixes subscription handlings