JAL-1833 revised implementation