Fixed #70
Empty keys for custom fields are handled correctly