Fix fields initialization