Failfast behaviour change [update]