Fix undefined properties