Fix control design