fixes #18 for hydro