bugfix in previous v2 enforcement