Fix for HYDRUS-81, fix for HYDRUS-79