Wrap Vector fields in Maybe #1475