Issue #101: adding removed validation