236 - JHI_3383-Edit