reworked support for "handleLinear"