Fixed OriginEnforcer