[HELIX-109] Review Helix model package, bug fix