171 - JHI_3309-Edit