fixed history and opt-out