add collection enforcement

@amuller, @scoen just a minor change