JAL-2603 Putative fix