Consistency checker, for #446