fixing id parsing