Fix for Hydrus-172, Hydrus-177