JAL-1685 fixed