fixed field ordering bug