Fixed Helper component, broken due to mad merge (Refs 7bdd684de8f85ff884dcbfdace4acfbc051004a6#diff-4cc83506859a5fa2b49f7bcd9fcb24f9)