Fix map/list decode bug