Fix issue with subscription error