Bugfixes/unsubscribe undefined