Edit Check

Edit check #1608.