Fixes #90 ina  more or less correct fashion.
Unfortunatly, i fear a certain performance loss that i must valdiate against buildhive ...