Fixed compatibility with Control class