fix surveyor helpers #3441