Fix bug when a class has Many static fields and a map/list with one of t...

Hi Luca

Thanks for that test case. It seemed the issue had to do with the static Map having a reference to the static fields in the same class. all sorted now. Really hope I have closed all the loop holes this time..

Regards
Rotondwa