Workaround for Fluent dialect issue