More faulting optimisation