Comment 7 for bug 525508

I have no objections, I had some difficulties in navigating the code so I somehow missed to check how the data is actually stored. It is actually good to see a better approach because with that I learned a better approach.