Retain the same order of component properties when adding a second variant

For components that have a lot of component properties, it can be a real pain when you add another variant later on. If you have already arranged your component properties into an order that makes sense, adding another variant to the component messes up the order of component properties. So please can Figma respect the existing (user-defined) order of component properties when you add a second variant to a component?