Fix for forage crash