fixed control state to include else in case