Adding hidden state to controls bug fix