Update to b3ebc7 - Use id for key if parent not set

From: b3ebc7c604f9d4333f58d1c0172f9333b04b1356