JAL-2576 Proposed fix