fix #120 & Jedi update