Addresses CISWMI-196