Fixed preemption.
Merge pull request #84 from hawesie/hydro-devel

Fixed preemption.