Fault bug fix