Fix bug in TenantCommandInterceptor