adds missing calls of unsubscribe method