Fix based on #529 for topic unbinding