Temporary fix for unsubscribe bug