I got same problem last year when I came back from Canada. what I did is make an appointment via infopass system,take to homeland security officer, and got it fixed.