Edit Check

Edit check #1606.