Fixed some checking to explict controls