Fixing faultOnFailure issue