Fix control weird control surface issues