fix for Hydrus-126; Hydrus-129