Yes, this check will be part of @zaggino's suggested changes.