fix subscriptions popping