Fix issue with rw_fail