subscription bug fix