fix for Hydrus-84; Hydrus-89; Hydrus-76; Hydrus-82; Hydrus-90