#558 - Don't shift order for fields marked as alternate order