Bugfix with unsubbing