Fixed the fields list