Fixed issue with stopping subscription