Fixing incompatibility between EB and multitenant