Removed hack in FluentClient.