adjust to latest Jalangi