work-around for subscription bug...but we need to go further down the rabbit hole