fix subscrive/unsubscribe