fixing JH mistakes