fix push state order