To be honest, that was my initial thought, but I saw your comment in #687 saying to use an IntMap so I kind of forced the IntMap in there.  I guess you meant ObjectMap. I'll fix it now.