Fixed previous bug with subscription table