subscribe/unsubscribe bugfix