Hydro back port of pull request #19

Back port of #19.