238 - JHI_3384-Edit