Fix undefined field problem