bug fixes for subscribe / unsubscribe