Bugfix for control start breakage