Fix fluent interface