Simple fix for opt outs