I am on H1-B visa which was set to expire 10/05/2015. After that my company filed the amendment because of company name change, and with it my new H1-B expiration became 04/2016. Now the twist in the story is I took a cruise trip to Mexico in 12/2014, and my amendment was prior to the trip. While coming back from Mexico, even though I had my new I797c with me new date of 04/2016, Visa officer didn't even ask for it, and didn't update my I94 expiration date of 10/05/2015. Now, I just realized as my company is filing an extension, that becomes my latest I94 with 10/05/2015 is making me out of status. This is a complete horror to me, as I have been very careful to maintaining my status and It seems short cruise trips never get to issue a new I94. (Why on earth then update my latest entry date???). what are my options here? I am thinking of starting with going to deferred inspection office to get it corrected. However, I read that the officer there could just deny updating it. Please help me out here.