fix to do any TChi model and not just HH