Fault tolerant version works