Fixed opt out issue