Fix on withControls