234 - JHI_3382-Edit