[BUGFIX] CH and Z now are in subjects