Fixed JH issue