Keep original fields ordering when no specific order