slightly tweak control logic