Changing constrain by value addition behaviour to avoid empty elements