better enforcement

better enforcement