Fix of HELIO parse

#1158 but to master