JAL-2383 fixup from last merge