Update sight code to address issue #7006