Fixed: Id property removed from attributes map!