Fix of Bug #32