working on subscription bug