controlId calculation fix!