Use [] instead of undefined default fields

Partial revert of 9a599a8747b8cbc5b1650f68d0098952bc613d7c