Removed potential infinite loop.
Merge pull request #35 from hawesie/hydro-devel

Removed potential infinite loop.