fix for Hydrus-127; Hydrus-85; Hydrus-125