AETV fix for Helix