fixing subscribe/unsubscribe