Be more careful about enforcing limits