ADEN-1591 - offsetting