Tangmo,
Leave the everything as it is and just run latest patch again. See if it helps.