JAL-1841 robustness fix