fix potential crash for Fuerte on the farm
Merge pull request #234 from vrabaud/develop

fix potential crash for Fuerte on the farm