Fix metric ordering