@bagder enterprise-level fix