Nasty hack now also nastily handled
Added a counter to see how many entries we add