Edit Check

Edit check #1616.