fix fluent API