Added a final patch to show fix