Fix CSMS with CSMS_16BIT_TAGS not working