Added missing controlls handling.