Apply the same fixes to the Linear class of Support