[DF-1128] fix save reflection  bug, change state logic