fix for un-feature-gated struct variants