Fixed elements function to be more consistent with one-of