Fix fields with space