Add workaround for management interface