Improved settlement check