fix for autosubscribe