added handling for subtype 1/2