Fix adding fields that were nil