Edit Check

Edit check #1599.