Fix fields issue