Added fix for case where controls are inside a form