Fluent bug fix