Fixed some checking to explict controls (part II)