Fix issue #140 with settlers , and more others