Updated helper to suit faults