fix border state order