Fixed Subscription crashing