instead of forfeiting subscription fixes #2922 fixes #1537 (cherry picked from commit 77a357109a)
77a357109a