removed two hacks in control#start