Fix WCS re-ordering