Can you add a check that the value is also set in the non-flat quantity?