Through infopass to go to your local office, the officer

there could make changes for you by handwriting, and at the same time you could ask to double check if the information in the USCIS database is the right or wrong. I have had the similar problem.