Fix issue with settlers , and more others