fix id parsing