Fix potential crash on Helix