@Alex *****
, :O if you flew to Hanoi last month, when you got back you should have went to Chaengwattana and re-filed a NEW TM-.30 with your new arrival date and your new TM6 arrival/departure card.
Take your lease with you when you go to apply for your 90 day Non-B because I think you're going to need to file a new TM.30 and get the 800baht fine for failure to file within 24 hours of comin' back into the country.