Updare : Version 1.0.1 - Adjustment for  !J3.1