Settlement Issue fix