Fixing enforcer bug