Fixed the id parsing problem