Proposed fix