Edit Check

Edit check #1587.