Proposed fix for partial failures