Bugfix for https://catelproject.atlassian.net/browse/CTL-539

Why do you no longer loop through the value properties? Are you sure this is a solid fix?