Fixed 'undefined fields'