fixed.. anything else ? BTW I think we should also make the IdentyHashMap smaller on construction. At the moment it is of size 32, I think it is very unlikely that we need this. Maybe use 4 ?