Bugfix for control values not being set