Fixed logic bug causing subscriptions to not work