Edit Check

Edit check #1508.