Fixed comparison order with flint & steel metadata