Fixed declaration id parsing